Redid some url stuff, got a bunch of layout and stuff done