moved from awt to swing, minor clean up, added location constraints