Moved direct add button logic into a pre-render function to avoid having to override the LB class. Removed the unused class. Other code clean-up.