Added CSS formatting
Improved logic, validation, and style
Merge branch 'CSS'