Fixed settings and added settings menu