Fixed Merging Errors
Making Mobile Friendly
????