Smplify css/html structure