Rewriting miso, better markup
Fixed conflicts
Finished up style refactor