Added UI, Fixes made