bug fixes, better layout for phone sizes