Some refactoring, adjusting css