Newest UI

Conflicts:
	src/ui/MainWindow.java