Started working on the new flatly layout