UI improvements, add custom UI fields