UI issues fixed.
Checking in solution file