consolidating html layouts - still need to clean up scss