General clean up - got rid of some of the baggage from previous assignments
More work on the GUI Menu View