Refactor menu and update to 0.2.5