fixed up layout