Merge "Optimized Compnents' Layout"