Clean up default layout and style a little more