html changed, better skeleton