UI consitancy updates
Improved UI consitancy