Small device only layout changes #507