Fixes issues with mobile/tablet layout. Fixes #2 #3