Fixed message not showing on successful saving
Minor bug fixes and tweaks