More buttons implemented