Fixed some minor styling issues.
Some changes and refactoring in CSS