Some refactoring and new css