UI modernisation

** bug fixes
Crash Fix

Crash Fix
Final

-Final