Cleaned up the styling again
Fixed more style issues