New PSM markup, nav-item, and refactored input icons

References #97, #98, #99