minor layout improvements
minor bug fixes and layout adjustments