Removed, moved, and renamed button click functions for consistency