Done portrait on tablet, need to handle landscape