Working on CSS cleanup/ fixing merge conflicts