added remaining things to do.
fixed minor layout thing.