Small fixes and adjustments. Now validation just needs to be moved to the proper tab