Changed to use ids instead of classes