Header views, optimized code and more adjust