Removed the signal/slot connections and using the slots directly.