UI fixing work for webi1

In Progress