#242 - improved method used to lay out NUX controls
Merge branch 'develop' into issues/242-nux-layout
Merge pull request #643 from wordpress-mobile/issues/242-nux-layout

#242 - improved method used to lay out NUX controls