Basic scaffolding and html goodies
fixing conflicts