Theme restructure. CSS and JS fixes