New components + smal fixes