Made UI a little bit more complex