Improve mark-up.  No absolute positions anymore.