some design fixes
first step of content import