UI improvement merged

UI improvement merged. still messy for now