Updated tablet view and small refactorings