have the layout working pretty well