Dominan Model,View,Controller Fix, minor bugs