Refactor, new buttons in menu, useBounds in layouting