rearranging the header and playing with some design stuff