Small updates; added placeholder for Settings