Initial fix from Michael Peters addressing small-screen UI issues: LP#767507