Removed old batch file
Fixes for Genymotion
Fixed box color layout
Some cleanup