minor design changes
js optimizations
minor design changes