Improved Ham Shack layout