added some new ui modifications and new preferences. little refactoring