Add settings link
Some bugfixes