further progress in presentation, finetuning of layout