ui changes (intial)
Merged