Add ability to add 'shapes' to layouts