More CSS fixes, other fixes

cleaning up the code a little bit, also fixed an issue with a query, and
fixed issues with iframes still being used rather than includes and divs