-Bugfixes while Testing on Tablet