Feature/swap html5 elements