GUI Improvement. I am probably over-doing it, but it's fun..