Layout fixes for Emulator