Changing CSS and minor errors (naming, etc)