added all vector layers and cleaned up save layout