final layout changes to prepare for launch; needs js cleanup badly when time allows or complaints come in