Fix out limit and improve UI