Several design adjusments