Started on settings page and fixed orientation change bug