Normal and tablet layouts now work