Mostly changes for M and M page