big update to layout