various minor layout and functional mods. need to check results and make anwers better layout