Interface tweaks

#3164