work on ui and theme