Fixed a view issues

Better performance and many other features