Added more to style/layout