GUI code cleaning, Screen linking fixes

Cleaning up the GUI code for what I have so far.  Most current buttons
function (as linking).