Few UI improvements and Leave type validation