Updated to put in base styling and base layout