Made changes to layout