Updated the basic layout of elements and changed to events
transportation of commands