Removed unused mapping.
Added horizontal lines. Modified UI