General html updates and cleanup