Rough styling for app and pre-merge of test folder in to main app commit.