Refactored html/css