Cleanup layout template, add some base style