adds settings activity + some fixes