Settings options now checks for props properly