add some markup for design, make design and bugfixes