Merge pull request #23 from bobrown101/master

Adds ES and new UI improvements
Merge pull request #24 from bobrown101/master

Fixed env variable bugs
Simple UI changes and pagination update
Some various cleanup