package refactor,
will work on tablet seamlessly,