cleaned code, moved breadcrumbs out of contentSub, minor bugfixes

Change-Id: I3e32ceaacfc7c33a1e235f6c03fb172f5636e9de