UI design - docks and add more controls