Updated basic layout and styles