layout & space fixes #281

layout & space fixes #281
layout fixes #321

layout fixes #321