Unified look and feel, settings

This pull requests includes @boris-savic's changes.