Style fixes and new blocks