getting closer to fixing the layout