added new ui and stuff