Misc changes

Layout fixes, redirects