Made changes to layout and structure