basic layout improvements, but javascript is broken in this commit.