Few small tweaks

Added form labels and a confirmation dialog that options have been saved