[V2S1_US15] Added controls on save + UI improvements