layout fixed up... a bit.