Refactoring + CSS restyling