App Builder Update

Fixed some bugs in App Builder