Yeah generic layouts would be nice for sure