UI tweaks and more settings added
more tweaks