Move common methods to utility classes, clean up navigation, fix login