Removed toolbar/made things look better as well as organized better