Nick making new ui

is this merge??