Minor fixes on UI and functions signatures