Possibly fixing issue in #1 with layout only looking good on my vaio.

Wasn't able to test it on the surface results in the simulator are
    promising.