fixing up layout