ui changes
merged ui and backend