More improved changes to layout and content