Change screen width from 280 to 480
Revert some unnecessary changes