Updated with theme, starting to improve the site/page