fix few bugs and fit the screen size of ipod
merge