updated UI
Updated more UI
merged sort of
Everything is merged
merged to head