Design changes

Sorry I added you one problem on fields :*