Commit after working on redesign