Refactor button and id names