Refactor Layout and add hands to Key.