Also fixed the solution window!