Added final missing blocks and updated style