This is no longer needed with the right layout