Fixed UI issues
Stubbing out UI
Finished UI stub