Improves switch UI