Layout improvements and additions