Updated markup and moved initial position setting to CSS