Update styles and improved layout