#31 #30 #26 Working on ui