more updates and layout changes