SOL-1157 -- moving buttons from top to bottom and also using the standard save/cancel buttons in signatory edit view. and update the bokchoy test
