removed border and switched buttons