Better handling of layouting of components throughout features