Refactored UI

Refactored main ui, now it looks almost like the final version for part
1