Changed coding style
Somewhat improved the UI