Started working on settings, and cleaned menu xml