Fixed up layout and fixed mistakes.