Fixed resume form and some minor changes