Second commit
Implemented the settings activity
Minor changes, modifications and improvements.