added save into action-bar, some other modifications and improvements