Ensure that the length is always longer than the width and remove unnecessary data-ifs

Reviewers: eater

Reviewed By: eater

Differential Revision: http://phabricator.khanacademy.org/D12622