Frontend fixes

closes #206 
closes #207