tweak UI a bit to be cleaner, update some error messages to be more clear