Pileks front end refactor

Merge with master