Improving settings, adding database