fix to support portrait mode
update score board
merge with master