Started new ui in separate file. Will merge once finished