add loading + some fixes mvc