Major UI improvements, minor routing changes, bug fixes