added more dynamic bits and bobs - to the layout