added small change to drawer
fixed some functionality
merge after fixing conflicts
getting the DOM back to normal