Web/Code: Fixes and Optimization.
Thanks @ Kim Benker