Last fix of ui and added listeners