Resharper optimized version.
Added navigation bar, navigation service.