Added eNanoMapper
New layout