fixed layout problem on add truck page
change layout control with bootstrap to make it responsive to any screen sisez
fixed merge conflict