reorganzied includes and added edit button function
few style changes