New frontend styles
Fix Merge
Drag and Drop functionalty complete