UI fixes and some more functianlity added