Startup positioning / size improvements

Resubmit of #465 to the fd5 branch.