made settings only show when necessary and also removed the lint error that was causing travis to fail