First step in restyling and unifying the layout