some changes and added settings page