Fix menu and category buttons

It closes #37 and it closes #38