Fixing sizing issues noticed on emulator.