UI fixes
Resolving Merge conflicts