- Changed #ids to use naming convention with dashes