Settings screen fixes #77