a82cb15 Some layout and style changes