Close #646 - Replace ID's with classes