More work on the GUI. It actually starts to look like something now