Final design cleanup until **1st launch** - part 1