refactored styles and source.js