[Major] Some Changes and UI tweaks