Some fixes layout styles and markup