Moved subsection functions to parents section, removed old
user-interface navigation functions, more clean-up.