Added some extra sets and started working on the settings screen