Edited code, added HTML5 elements