Touch up menus and .current border
Close #227, close #229