Made changes to simplify css