*still working, minor ui fix