Some mockup fixes

Mockup view wasn't working for me. Done some changes.