Budspencer theme improvements

Use event handlers to improve performance