revert separate user and folder buttons