add edit and fix top bar