[FEATURE] Better view for services