Refactored, cleaned, added Bootstrap