d7 2.x theming and updates
d7 - 2.x cleaning up layout