simpler style
resolving conflicts
fixing db mixup
markup and css cleanup for new pages