changes on dock template and other minor
changes on dock template and other minor