Added settings to db
Button tweaks