UI updated. Comment bugs fixed.