css changes, scaling removed
Merge n stuff