Improved nested componenets by removing non necessary ones.