Settings Page work, Bug Fixes