Cleaned up jquery and html slightly