modified ui and changed presentation accordingly