Cleaner formatting in some files. Added avoidance of id selectors when possible.