Layout fixes for Emulator
Merge pull request #3 from mobileteck/master

Layout fixes for Emulator