Reorganize stylesheets and delete redundant markup