Fixed the problems with new mbank layout