Removed memory usage, added included files count, fixed view