Scripts renamed & styles updated for better visibility
Some polishing