fixed things to fit on emulator screen
fixed merge changes