more design fixes
removed common templates