Improvements on GUI

Still bad styles, needs cleaning