Mob 1532

@nandy-andy @RafLeszczynski @rogatty Please, review ;) DO NOT MERGE JUST YET
we should put error in some container in modal content, currently you are replacing modal content