Reorganized menus and layouts.
Fixed some issues.