Code cleanups
more tabbed look for icons in the bottom