big update - layout and structure