Fixed code import
Parts of design reworked