Settings page Bugs fixed