Solution Form Fixes