solved #58
+ minor layout changes