ok I think this should be a better layout