First version
minor layout fix