Test layout/style changes
Initial layout update. Mostly setting framework for further updates