Documented code and minor UI fix