Fixed resume and some margin problem