Improved GUI (Part 2)