GUI improvements

Improved the 2 GUI windows, and addded functionality to the second
window