More CSS refactoring

Fixed more minor CSS issues found during device testing.