Improved hook layout