Moved map to top.
organized layout.