ui changes 502
Merge remote-tracking branch 'origin/sanathan4243' into sanathan4243
merged ui + settings 502