Cleaned up UI on our forms