Updated setup file and added settings page