including MVC super-nearly-done refactor plus Eiko's css fixes, furthest along we've gotten so far