Refactor/cleanup bookmark components #34

Closed dohaki closed 3 years ago