Little bug fixes
CSS Cleanup