improved UI with new theme