layout & initial code review changes