better look&feel #9 - changed to labels in edit page and improved settings save page