Renamed few elements. Moved elements.
Fixed layout.