Minors layout improvements