rearranged layout to eliminate too much whitespace