Style fixes and content (incomplete)