Some small tweaks. Design issue with resend needs to be addressed