Improved look and feel
Interface cleanup