Few layout and performance optimizations