Fixed bug in saving target, and minor layout improvement