Changed settings pages and session stuff