Fix form size issue WIP