CSS refactor + add consistency