Revert "MOBILE-210 Trying to fix the layout problems"

This reverts commit 389f484bc989ea9cec4d395c03a3ac9c2429ab38.