Made some changes to UI
Made some minor fixes to spawn and UI