Converting to ajax and design changes