Removed the Settings Activity

Merged everything into main activity