Final GUI Changes

Final Changes before combing back into Master.