Add indexes and improve GUI