addtional layout improvements