added border box for other browsers
fixing edit button for smaller screens
resolved conflicts