Improve service view