roll back unnecessary changes on composition and ui