Updated/added slots for window class