Cleaned up the GUI and got the input working a bit better.