Finished creating general layout - started adding functionality