Finished rough layout

Layout and functionality working