Updated all views to standard layout practice