Bug Fixes and design updates

Currently fully functional.