#63 Bug Fix: inappropriate settings screen