Fixed the user interface and some small aditions