#22 - more user-friendly codes
layout improvements