updated ui & structure