New basic layout
Layout and styling changes