moved buttons to cab, improved modal