okay this is a much better layout