Made form nice
Fixed merge conflicts