Theme restructure. JS-fix. Rolfs designfixar