Changed IDs to match Javascript