Merge pull request #88 from 1aurabrown/laura

@ashfurrow => First eidolon pr - UI work
more changes