ui looks better but still need to make it work
resolved conflict