minor layout adjustments
minor bug fixed