MIFOS-5980: Fixed some of acceptance tests
MIFOS-5978: Fixed layout issue
MIFOS-5980: Fixed some of acceptance tests