Design fix

finally found some time to fix some flaws in the design
please tell me if there is still something I could make better