Styling & css changes & simplification