Styling updates

Various markup updates for simplication and some styling updates as well