I undid a lot of UI code done before and started cleaning up the code to separate concerns as much as possible