Now discoverable with layout fixes