Revert "Revert span2 for edit button."

This reverts commit 858e70f0ab29710f5280eb910d26c3779c6ef8be.
Make navbar better responsive for all screen sizes.