Couple fixes and setting page changes