~ ui improvements
~ bug fixing