modified ui
Added all planned functionality at this stage.