Interface improvements, moving buttons around