Layout improvements and some additional functionality