Added git #TODO tags and updated layout missing platforms to be consistent.