Fixed issues, added settings link