Changed all user buttons to partial